diff --git a/swh/web/ui/templates/api-endpoints.html b/swh/web/ui/templates/api-endpoints.html
index ee254388f..f81fd2cef 100644
--- a/swh/web/ui/templates/api-endpoints.html
+++ b/swh/web/ui/templates/api-endpoints.html
@@ -1,69 +1,69 @@
 {% extends "layout.html" %}
-{% block title %} Software Heritage API – Endpoints {% endblock %}
+{% block title %} Endpoints – Software Heritage API {% endblock %}
 {% block content %}
 
 <nav class="bread-crumbs">
   <ul>
     <li><a href="/">API</a></li>
     <li>/</li>
     <li>endpoints</li>
   </ul>
 </nav>
 <div class="api-doc">
   <p>
     Below you can find a list of the available endpoints for version 1 of the
     Software Heritage API. For a more general introduction please refer to
     the <a href="/api/">API overview</a>.
   </p>
 
   <p>
     Endpoints marked "available" are considered stable for the current version
     of the API; endpoints marked "upcoming" are work in progress that will be
     stabilized in the near feature.
   </p>
 
   <noscript>
     <ul>
     {% for route, doc in doc_routes %}
       <li><a href="#{{ route }}">{{ route }}</a></li>
     {% endfor %}
     </ul>
   </noscript>
 </div>
 
 <div class="api-doc table-responsive">
   <table class="table table-striped search-res swhtable">
     <thead class="thead-default">
       <th>Endpoint</th>
       <th>Status</th>
       <th>Description</th>
     </thead>
     <tbody>
       {% for route, doc in doc_routes %}
       <tr class="api-doc-route{% for tag in doc['tags'] %} api-doc-route-{{ tag }} {% endfor %}">
         {% if 'tags' in doc and doc['tags'] is not none %}
         <td id="{{ route }}">{{ route }}</td>
         <td>{{ ', '.join(doc['tags']) }}</td>
         {% else %}
         <td id="{{ route }}"><a href="{{ route }}">{{ route }}</a></td>
         <td>available</td>
         {% endif %}
         {% set doc_intro = doc['docstring'].split('\n\n')[0] %}
         <td>{{ doc_intro | safe_docstring_display | safe }}</td>
       </tr>
       {% endfor %}
     </tbody>
   </table>
 </div>
 <script type="text/javascript">
   $(document).ready(function() {
     $('table.swhtable').DataTable({
          "paging": false,
          "info": false,
          "order": [[1, "asc"]]
       });
     $(".dataTables_filter input").addClass("form-control")
 
   });
 </script>
 {% endblock %}
diff --git a/swh/web/ui/templates/api.html b/swh/web/ui/templates/api.html
index aea670365..40c1de741 100644
--- a/swh/web/ui/templates/api.html
+++ b/swh/web/ui/templates/api.html
@@ -1,8 +1,8 @@
 {% extends "layout.html" %}
-{% block title %} Software Heritage API &ndash; Overview {% endblock %}
+{% block title %} Overview &ndash; Software Heritage API {% endblock %}
 {% block content %}
 
 <div class="api-doc">
   {% include 'includes/apidoc-header.html' %}
 </div>
 {% endblock %}
diff --git a/swh/web/ui/templates/apidoc.html b/swh/web/ui/templates/apidoc.html
index 4a3de9861..549c15a9e 100644
--- a/swh/web/ui/templates/apidoc.html
+++ b/swh/web/ui/templates/apidoc.html
@@ -1,124 +1,124 @@
 {% extends "layout.html" %}
-{% block title %} Software Heritage API &ndash; {{ route }} {% endblock %}
+{% block title %}{{ route }} &ndash; Software Heritage API {% endblock %}
 {% block content %}
 <nav class="bread-crumbs">
   <ul>
     <li><a href="/">API</a></li>
     <li>/</li>
     <li><a href="/api/1/">endpoints</a></li>
     <li>/</li>
     <li>{{ request.path }}</li>
   </ul>
 </nav>
 
 {% if docstring %}
 <div class="docstring">
   <h2> Description </h2>
   {{ docstring | safe_docstring_display | safe }}
 </div>
 {% endif %}
 {% if response_data and response_data is not none %}
 <div class="response-data">
   <h2>Request</h2>
   <pre><strong>{{ request.method }}</strong> {{ request.url }}</pre>
   <h2>Response</h2>
   {% if headers_data and headers_data is not none %}
   <h3>Headers</h3>
     {% for header_name, header_value in headers_data.items() %}
       <pre><strong>{{ header_name }}</strong> {{ header_value | urlize_header_links | safe }}</pre>
     {% endfor %}
   {% endif %}
     <h3>Body</h3>
     <pre>{{ response_data | urlize_api_links | safe }}</pre>
 </div>
 {% endif %}
 <hr/>
 <div class="doc-urls">
   <table class="m-x-auto table">
     <thead>
       <tr>
 	<th>URL</th>
 	<th>Allowed Methods</th>
       </tr>
     </thead>
     <tbody>
       {% for url in urls %}
       <tr>
 	<td>
 	  {{ url['rule'] }}
 	</td>
 	<td>
 	  {{ url['methods'] | sort | join(', ') }}
 	</td>
       </tr>
       {% endfor %}
     </tbody>
   </table>
 </div>
 <hr/>
 {% if args and args|length > 0 %}
 <div class="doc-args">
   <h2> Args </h2>
   <dl class="doc-argslist dl-horizontal">
     {% for arg in args %}
     <dt> {{ arg['name'] }}: {{ arg['type'] }} </dt>
     <dd> {{ arg['doc'] | safe_docstring_display | safe }} </dd>
     {% endfor %}
   </dl>
  </div>
 {% endif %}
 {% if params and params|length > 0 %}
 <div class="doc-params">
   <h2> Params </h2>
   <dl class="doc-paramslist dl-horizontal">
     {% for param in params %}
     <dt> {{ param['name'] }}: {{ param['type'] }} </dt>
     <dd> {{ param['doc'] | safe_docstring_display | safe }} </dd>
     {% endfor %}
   </dl>
  </div>
 {% endif %}
 {% if excs and excs|length > 0 %}
 <div class="doc-excs">
   <h2> Raises </h2>
   <dl class="doc-excslist dl-horizontal">
     {% for exc in excs %}
     <dt> {{ exc['exc'] }} </dt>
     <dd> {{ exc['doc'] | safe_docstring_display | safe }} </dd>
     {% endfor %}
   </dl>
 </div>
 {% endif %}
 {% if headers %}
 <div class="doc-headers">
   <h2> Headers </h2>
   <dl class="doc-headers dl-horizontal">
     {% for header in headers %}
     <dt> {{ header['name'] }}: string </dt>
     <dd> {{ header['doc'] | safe_docstring_display | safe }} </dd>
     {% endfor %}
   </dl>
 </div>
 {% endif %}
 {% if return %}
 <div class="doc-return">
   <h2> Returns </h2>
   <dl class="doc-return dl-horizontal">
     <dt> {{ return['type'] }} </dt>
     <dd> {{ return['doc'] | safe_docstring_display | safe }} </dd>
   </dl>
 </div>
 {% endif %}
 {% if examples %}
 <div class="doc-example">
   <h2> Examples </h2>
   <dl class="doc-example dl-horizontal">
   {% for example in examples %}
     <dd>
       <a href="{{ example }}">{{ example }}</a>
     </dd>
   {% endfor %}
   </dl>
 </div>
 {% endif %}
 {% endblock %}